GtkColorChooserWidget: deselect swatch before removing palettes

When adding custom palettes, set the current swatch to NULL if the
palette it is on is going to be removed.

https://bugzilla.gnome.org/show_bug.cgi?id=693995

diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index be954a26687421d4800fd072c85f3380afb7a534..8e6cf2c82e78506d8cdf72e1aa032b3c4d91b01e 100644 (file)
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -296,6 +296,10 @@ remove_palette (GtkColorChooserWidget *cc)
   GList *children, *l;
   GtkWidget *widget;
 
+  if (cc->priv->current != NULL &&
+      gtk_widget_get_parent (GTK_WIDGET (cc->priv->current)) != cc->priv->custom)
+    cc->priv->current = NULL;
+
   children = gtk_container_get_children (GTK_CONTAINER (cc->priv->palette));
   for (l = children; l; l = l->next)
     {